Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

linux/common-config: fix typo (isLoongarch64 -> isLoongArch64) #372726

Merged
merged 1 commit into from
Jan 14, 2025
Merged

linux/common-config: fix typo (isLoongarch64 -> isLoongArch64) #372726

merged 1 commit into from
Jan 14, 2025

Conversation

misuzu
Copy link
Contributor

@misuzu misuzu commented Jan 10, 2025

Fix for #366004 (comment)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Jan 10, 2025
@misuzu misuzu mentioned this pull request Jan 10, 2025
Merged
13 tasks
@misuzu misuzu requested a review from alyssais January 10, 2025 19:14
@K900
Copy link
Contributor

K900 commented Jan 10, 2025

Can this not go to master?

@misuzu
Copy link
Contributor Author

misuzu commented Jan 10, 2025

Can this not go to master?

Nope

diff --cc pkgs/os-specific/linux/kernel/common-config.nix
index 302325018eac,43ed0d9aef95..000000000000
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@@ -499,7 -505,13 +499,17 @@@ le
          DRM_AMD_ACP = yes;

          # Enable AMD secure display when available
++<<<<<<< HEAD
 +        DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes;
++=======
+         DRM_AMD_SECURE_DISPLAY = lib.mkIf (
+           with stdenv.hostPlatform;
+           (lib.versionAtLeast version "5.13" && (isx86 || isPower64))
+           || (lib.versionAtLeast version "6.2" && isAarch64 && !stdenv.cc.isClang)
+           || (lib.versionAtLeast version "6.5" && isLoongArch64 && !stdenv.cc.isClang)
+           || (lib.versionAtLeast version "6.10" && isRiscV64 && !stdenv.cc.isClang)
+         ) yes;
++>>>>>>> 08b8ea1361e4 (linux/common-config: fix typo (isLoongarch64 -> isLoongArch64))

          # Enable AMD image signal processor
          DRM_AMD_ISP = whenAtLeast "6.11" yes;

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 14, 2025
@vcunat vcunat merged commit 1c7f731 into NixOS:staging-next Jan 14, 2025
24 of 27 checks passed
@misuzu misuzu deleted the linux-riscv64-eval-fix branch January 14, 2025 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais alyssais approved these changes

Assignees
No one assigned
Labels
6.topic: kernel The Linux kernel 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@misuzu @K900 @alyssais @vcunat @wegank